bitkeeper revision 1.1389.1.40 (4280bd87C1W-FAi3spA6svoofdkZ5g)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Tue, 10 May 2005 13:56:23 +0000 (13:56 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Tue, 10 May 2005 13:56:23 +0000 (13:56 +0000)
Merge firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-clean


Trivial merge